Merge "Fix Accessibility Menu setting is not restored by D2D" into rvc-dev