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

Change-Id: I6b94c545e37df11f85018026f6ba9baa4c3cc079