Merge "Fix CustomizedAppBarTest" into main