Merge "Use normal rotation if orientation is changed by resume-scheduled app"