Merge "Add aconfig flag  to control release of unmounting changes" into main