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

Change-Id: I18053a8784f185cb752f6f44175123ffd0b2acdf