Merge "Change PersistableBundle API per council's request" into lmp-preview-dev