Merge "Allowing rotation while adding lockscreen widgets" into jb-mr1-lockscreen-dev