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

Change-Id: I0f98773780142e52ee2108170c43374d619200f6