Merge "Camera2: missing rendering progress bar workaround"