layers: Port screenshot fixes to master

Sourced from sdk-0.2 branch commit c98372f1
3 files changed