Merge "Always re-enable the fallback WebView if needed." into qt-dev am: 4c510c08da
am: 39cc8ee150

Change-Id: I61571c0ae961d35366e0c30197eb1138609b10d1