Merge "SF: check secure layers in screenshot message handler" into nyc-dev