Merge "DO NOT MERGE Hide banner manifest attribute." into klp-modular-dev