Move cell notes too when sorting.

Change-Id: Ibb330aa6f515d756c5578296fd9c83aa235a59fd