Merge "Remove storage sandboxes related code." into qt-dev