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

Change-Id: I2fbd73cf5075721514490af4711026b05ee3b92e