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

* commit 'b718735aae23455126719ba0b23edf2a64875f4e':
  Avoid repositioning unattached overlay views