Merge "Retire CenterCropBitmapTask to avoid using AsyncTask" into tm-dev