Merge "Fix Developer options appears after first boot, disappers on Settings...
Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev
am: 81c03dc3
* commit '81c03dc3':
Fix Developer options appears after first boot, disappers on Settings Menu Reload
Change-Id: I75dcdc1f242a99abdbeb96460dcbda5787f22b63