Merge "Add a system property to disable screen decorations"