Merge "Convert SysUiState flags from int to long" into main