Merge changes from topics "3button-runner", "re-enable-flicker" into sc-dev

* changes:
  Disable some trace assertions
  Fix use of NavigationModeRule on flicker