Merge "Add workaround to handle overlay package changes for non-primary users" into qt-dev am: a35495ffa3
am: e58127d993

Change-Id: I5914a8e4af3a97a43a0f71673cee369deab080fe