Merge "Removes reflection from AmbientDisplaySettingContainer" into pi-dev