Merge "Only call IStatusBarService from foreground user" into main