Merge "Fixed null pointer exception on mSupportedAreas." into qt-dev am: 9bde289191
am: e6958a547f

Change-Id: Iee2e767c0da3e693b50671f02adf42f887c48ad6