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

Change-Id: I1b1ea6b9cdfdc7db542903debee4fc60cd26d425