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

Change-Id: Ifc9bde5fdede439771700a6fe6a3ae126a24b838