(Bug 46470) Added support for defaultsort editing

Change-Id: I827a37603e95b33f5e913097b9f8c0844d540110