Merge changes from topic "wm_move_disp_to_hier_2"

* changes:
  Move some display logic into hierarchy [2/2]
  Move some display logic into hierarchy [1/2]