Merge "Associate rotation watchers with displays"