Merge "Allow apps to associate a change in picture profiles alongside a buffer" into main