Merge "Dim correctly in screenshots on some devices" into udc-qpr-dev