Merge "SF: Add workaround to release screenshot buffer" into pi-dev
am: 6fa25f9d8f

Change-Id: I20c44440a717fd704fa8b73540ccdd358e8636a8