Merge "Synchronously finish boot when user starts in background"