SF: Fix a couple of Layer ref count issues
am: de84eb6b82

Change-Id: I779b869d340ce5320f7924ccd6579cada3227899