Merge "Fix RpcStatus to display "Working..." when header is hidden"