Merge "Fixing typos related to portrait enums." into jb-dev