Merge "Update CTS bug component for system ui"