am 847f4e0e: am d01a1b04: Merge "Remove unused views when we return to keyguard" into klp-dev

* commit '847f4e0e1bca36bec207a44ee5b3f3d9f74526f6':