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