Merge "Use the PersistableBundle instead of the Bundle" into sc-dev