Code cleanup

Change-Id: I4f8e40038ba7655d2e8420c1bc2899a8fede99f8
App layouts list. Methond from AOSPA

Change-Id: I0b1719bc6c83641441914700943118339e35eafe
Widgets

Change-Id: I6ded1cfd42ae6dfa1806137a24ae39039ad501e7