Merge "Use separate Settings.Secure entry for the new LPH settings page." into main