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

* commit '45ca778d8ed90aff3f72fc85f806cedbd4121cc1':
  Make sure the controller will get repositioned after size changing.