Merge "af-main: Add ability to manage all widget"