Merge "Launch new Home app when selecting Home app in Settings"
am: f05fc290b7

Change-Id: I5b9e419fb420351dba76c5dfe1f238f5e4a7e562