Merge "ui: Refactor the declaration orders." am: 79a23b30d2
am: cb94b611cf

Change-Id: I70be41861c95d25849190062dd710097b7648375