Merge changes from topics "presubmit-am-5b86c75ec52142ad9dfd0837f3fad249", "presubmit-am-c314b40f446d47e6aa51654f7a3e4f49" into tm-dev

* changes:
  SF: Unify data types for display modes
  SF: Clean up plumbing for boot display mode