Album sort completed, album edit completed

Change-Id: Ib4c4e3b92bbee43a787472cf7d2683a8924abe50