Merge "Move tablet specific stuff into tablet.mk" into main