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

Change-Id: I33333485272d7a95b00099cfdc7e98ed930c3822