Merge "Move JankType to libgui"