Merge "Add SystemUiSystemPropertiesFlags" into tm-qpr-dev