Merge "Fix NPE on first-ever boot if display has rotated."