Merge "Simplify KeyguardBottomAreaView reinflation logic" into qt-dev