Merge changes from topic "CanUnIsolateStorage" into qt-dev
am: 88c946e073

Change-Id: Ifdb2db750d51150961b69f912995daf211ba6906