Merge "Clean up AmbientStatusBarViewController's Status Bar Listener." into main