Merge \\"Fix bug with launching home activity from LockSettingsService\\" into nyc-mr1-dev am: 49fd320574
am: 7d5389bd07

Change-Id: I93dd8dd06d447b6d5401b7af8fc18b6345ce03b1