Merge "Remove extra KeyguardViewStateManager construction" into jb-mr1-lockscreen-dev