Merge "Split up KeyguardBottomArea" into udc-qpr-dev