Merge changes from topic "sf_display_proto" into sc-v2-dev

* changes:
  [DO NOT MERGE] Sync flicker from master to sc-v2
  Add display proto info