am b2488931: Merge "Avoid repositioning unattached overlay views" into jb-mr2-dev

* commit 'b2488931cbd25c0e9dbc648882e272048c075741':
  Avoid repositioning unattached overlay views