Merge changes I967b7fb7,Idddb4bae into tm-qpr-dev

* changes:
  KeyguardBottomArea: migrates to Expandable
  Adds toggle support for quick affordances.