Merge "Move some display logic into hierarchy [2/2]"