Merge "Add multidisplay.mk to all handheld devices" into main