Merge "Reduce opacity of file type scrim" into udc-dev