overlay: SystemUI: move to common
clean up