Merge "Remove obsolete assets used in horizontal orientation" into jb-dev