Merge "Move rotation info to display level."