Merge "Remove use of private Display apis"