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

Change-Id: I73030d71e22d8f21058873bd699fc16a5866b994