Merge "Reset system fixed to clean storage perm model 2" into qt-dev