Merge "Include the clock in landscape on Xoom" into jb-dev