Merge "Fix resize info activity not showing in some cases" into rvc-dev am: 45893857 am: 7c6726f6 Change-Id: I112b80d0d6735a8ea1472b504435f850ddefdc7d