Merge "Refactor the lockscreen camera widget, removing the bitmap." into jb-mr1.1-dev