Merge changes I771230c1,I460dfc11 into main

* changes:
  Support media on splitshade with constraints
  Fix NSSL flicker when going to/from OCCLUDED