Merge "Add "pm set-home-activity"" into nyc-dev