Merge "Fix flicker issue in widget picker with app activity in background" into main