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

Change-Id: I467eb2494c4ce442ecb4fbaf0cd47f6eb65cdeb7