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

Change-Id: I635c6d80624116b697cbaa5618a3264c628d8cb9