Merge "Fix nav bar visibility on lock screen"