Merge "Update visibility according to the change AVF directories layout" into main