Merge "Fixes black flash when starting preview" into udc-dev