Merge "SF: use shared_ptr to track hwcLayer"