Merge "Add new key from Settings.java to settings.proto." into pi-dev