SF: Fix a couple of Layer ref count issues am: de84eb6b82 am: 1ce7c1d3aa
am: 6ce2ad4310

Change-Id: I1eeff52d56054e0f5b6ee9eaa3b7b9abb99ad106