am e40b873f: (-s ours) am 491c833c: Merge "Cherry-pick "Dynamically enable spatial navigation based on events"" into klp-dev

* commit 'e40b873f639fec7e6b624a3d13d4e3c49042ed6d':