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

Change-Id: I8cac129192c9107a32567cb4e8857aaab5d24a6f