Merge "Enable lazy-loading of security views in keyguard" into jb-mr1-dev