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

Change-Id: I104ff96f2930bcd9cd9b69034970d57cc11fd4ef