Merge "Fix All Apps Icons Count estimation" into main