Merge "Render camera widget correctly after shell restart." into jb-mr1-lockscreen-dev