Merge "Fix crash on devices that don't support multiwindow" into rvc-dev am: 36703fbaa3 am: 9b23d98733 am: b700433651

Change-Id: Ib3d78b394fb74318229ab1db5a7b7c6161c601b9