Merge "Remove roam scan developer settings"