Merge "Supported data enabled override for different scenarios" into qt-dev am: d16b224ddb
am: 76bb57cfce

Change-Id: I5e901fae611f06ca9900c1f913b9586f0005fb97