Merge "Revert "Revert "Fix resize info activity not showing in some cases""" into rvc-dev am: b90e71d4 am: 79365a11 Change-Id: Ibdb748da33281e54823ab022867229aa94ad33a9