Merge "Separate the internal and external display rotations." into jb-dev