Merge "SystemUI: Fix for display datatype icon while in roaming"