Make mobile settings as first-class citizen optional, (2/2)