Merge "Move LayoutParam secure flag so it's set on the WS level" into main