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