Merge "Update overflow dot color when app icon flag is on" into main