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

Change-Id: Idb2d601fa627dcb8268228435192392c760787d0