Merge "DO NOT MERGE wait some time to avoid timeout of broadcast between stopping and starting user in background." into pie-cts-dev