Merge "Removes deprecated uses of Display#getRealSize in Gesture Nav Edu." into tm-dev