Merge pull request #11317 from t895/dialog-adjustment Android: Use progress indicator in short loading scenarios