Merge "Fix black screen during Quick switch" into rvc-dev am: c82ee307b1 am: 2f34b5f9fb

Change-Id: Iba11cc5c1d417bd7def1329a38b291cdeed558e5