Move display variant to family

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