Merge "Use screen rotation animation only if the display has content"