Merge "Fix content alpha" into jb-mr1-lockscreen-dev