Merge "Add boolean to Exception bundle, to indicate if Fallback is enabled" into qt-qpr1-dev
am: 5255adee45

Change-Id: I4ab78d32aad071bbb726a9e226fff314c4a50604