Merge "Add the loading progress UI when buffering"