Merge "Fix a NPE where developer options page crash sometimes." into pi-dev