Merge "[incfs] Skip empty folders for app updates" into rvc-dev