Merge "Don't hide the mobile type id if it doesn't change" into pi-dev