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