Merge "Prevent system ui applications from entering dw" into main