Merge "Remove volume plus flag in Settings" into main