Merge "Fix b/265054711: Settings crash on changing device orientation from battery usage page."