Merge "Remove drawer code from settings"