Merge "Use FLAG_RECEIVER_FOREGROUND for lock intent" into nyc-dev