Merge "Fix crash when rotating HighPowerDetail dialog" am: 783ff43769 am: 7598c6201d am: 8711f4055d
am: 8c9e3db8d9

Change-Id: Ib6d620f89225a8258b1671d206bb617e5d1bf56f