Merge "Changing per-app default request to TRACK_DEFAULT"