Merge "Fix bug with launching home activity from LockSettingsService" into nyc-mr1-dev