Merge "SF: Clean up HWC2::Layer ownership" into sc-dev