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

Change-Id: Ia762058f11c5ffc4d3bf95411fbb926246d56659