Merge "Make footer preferences non-clickable by default" into oc-dev am: 8fbb0bc1f2
am: 0686f63083  -s ours

Change-Id: I0877907fbfc1b8dd43d18d381ee5115150466ca8