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

Change-Id: I686d403222e6b96f9d23f9ed17b09e897ce55755