Merge "Recover status bar enabled state for all users"