Merge "single unlock target with honycomb semantics" into jb-mr1-lockscreen-dev