Merge "Fix resize info activity not showing in some cases" into rvc-dev am: 458938578f

Change-Id: Ic53ad2165ae23e1d8a0908e874bc8bcd0558831d