Merge "Add activity attribute allowEmbedded" into klp-modular-dev