Merge "Fix package name in StatusBarPopupChips flag file" into main