Merge "KeyguardBottomAreaView: cleanup." into tm-qpr-dev