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

* commit '8ffb135dc892c09f1781231f783b0890515b3d60':
  Make sure the controller will get repositioned after size changing.