Merge "Allow apps to apply picture profiles with priority to layers" into main