Refactoring and fixing bugs in Customize tray.

Change-Id: Ia37d3033d64036fd09f5f33443eb9f575e311c7c
10 files changed