Merge "Avoid keyguard UI layout dimensions underflow" into mnc-dev