Merge "Filter the content of the Bundles used as extras and styling APIs" into rvc-dev