Merge "Replace DisplayManager.getStableDisplaySize with max Display.Mode" into tm-dev