Merge "Moves battery saver warning message below Screen Attention setting." into tm-dev