Merge "Extract ParcelableUtils to avoid code duplication" into sc-dev