Merge "Update light mode when battery saver changes am: 244a43ee6f am: c9be359ad4 am: 3fb44388c4"