Merge "Make storage a restricted permission - framework" into qt-dev