Merge "Remove a few more usages of runOnMainSync in support-design"