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

Change-Id: I002bf95c1048d5f5107e702002edb2ca2e6452ae