Merge "Fix race condition betweeen Tuner APIs and with onReclaimResources"