Merge "Renamed DisplayInfo to TelephonyDisplayInfo" into rvc-dev