Merge "Fixing issue with wrong initial multi-window mode." into oc-dev am: 82792153c3
am: 5c6486b344

Change-Id: I1ee658c0ca43c345bfb24c9544af4b949f2e0f6e