Merge "Remove obsolete proguard rule for unconditionally keep specific classes" into main