Merge "Retire AsyncTask in GridOptionsManager"