Merge "Revert "SF: use shared_ptr to track hwcLayer""