Merge "Make "cmd package set-home-activity" more CTS friendly" into nyc-mr1-dev