Merge "Fix resize info activity not showing in some cases" into rvc-dev am: 458938578f am: 7c6726f676 am: 43519fac73 am: 9aaa2d1ff8

Change-Id: Ie651f2aa2c2182c0133567d2a6f3e9a7ecb6ad21