Merge "Fix enrolled pages not hide during SUW" into udc-dev