Merge "SF: Clean up HWC2::Layer ownership"