Merge "Fix education flows for thin letterbox" into main