Merge "Remove drawer from settings"