Merge "Buffering in full screen mode will show progressView"