Merge "Fix the doxygen command in key-grab.h" into devel/master