Merge "Move fixed-rotation-related display information into config"