Merge "Revert "Revert "Fix resize info activity not showing in some cases""" into rvc-dev