Move display variant to family trees

Change-Id: Iebf73370397bb0216ce7d32cc06473c30ad37199
Merge branch 'cm-11.0' into martincz