Merge changes Ib6985cf1,I61b18104

* changes:
  SF: Relax assertions for primary display removal
  SF: Ignore setActiveColorMode errors