Merge "ActivityManager start-user has wait flag"