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

Change-Id: Ibfd8ece64c59e05cbde9b1037cbed3afb4032880