Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev