Merge "Do not keep runtime invisible annotations in proguard.flags" into main