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