Merge "Only update overlays for target" into qt-dev
am: ed4820f0d0

Change-Id: Ie64e68bf5b13d81a991a29f0483c1c6f75dd4c00