Merge "Fix crash when rotating HighPowerDetail dialog"