Merge "Fix alpha value for device orientation" into jb-mr1-dev