Merge "Fix developer option not being enabled."