Merge "Move rotation tracking to DisplayContent"