Merge "Add the flag "clear top" when launching battery settings view" into tm-dev