Merge "Reuse device display code from sdk-common"