Merge "Cherry-pick "Dynamically enable spatial navigation based on events"" into klp-dev