Merge "Move manage menu user education into subview"