cherry_pick #2 home widget to master