merged keycapture changes as per XML change, and added camera test