Merge "Add default permission icon" into mnc-dev