Merge "Make sure the controller will get repositioned after size changing." into gingerbread