am 45ca778d: Merge "Make sure the controller will get repositioned after size...
am 45ca778d: Merge "Make sure the controller will get repositioned after size changing." into gingerbread
* commit '45ca778d':
Make sure the controller will get repositioned after size changing.