two preferences removed, collapsible and experiments

Change-Id: Ic8e273ca94f85e609709190260b10dadbf00b416