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

Change-Id: Ia0c5ef947c2f71343ef4ffb1950f08738c2d1aaa