Merge "Making moving getDisplayType to DisplayController so that it can be accessed without IDP" into main