Merge "Removing unnecessary modules from SystemUIModule" into main