Merge "Revert "Add divider line in Preference for scan QR code button and share hotspot button""