Merge "Notify ScreenOffController of battery saver change" into tm-qpr-dev