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