Merge "pm set-home-activity waits until completion" into qt-dev am: ec41ca2aa7
am: c2e06412fa

Change-Id: Ifb4d7eaeb3b3f1c45d5074039f77124405408716