am e2d4301f: am 54854d31: Reconcile with ics-mr0-release ics-mr1-release

* commit 'e2d4301f7119fc21ba5e867d9793cd73e089264b':
  More fixing for issue #5366535: Lockscreen has wrong layout...
  DO NOT MERGE.  Integrate from MR 1 to fix issue #5366535: Lockscreen...