+ This only covers collapsing context according to the diff preferences. Clicking on the control does nothing in this change. Change-Id: I82e07d1ba55630351b1f79db5f44ff81e2fafecd