Merge "Clean up separator string in keyguard view" into jb-mr1-lockscreen-dev