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

* commit 'd01a1b0473a38bd75555b3138e8e0037fe391d82':
  Remove unused views when we return to keyguard