Merge "[5/n] Letterbox Education: update the dialog layout."