Merge "Update surfaces secure flag on screen capture setting change" into mnc-dev