Motion key improvements

Signed-off-by: John Dulaney <jdulaney@fedoraproject.org>
Merge remote-tracking branch 'dulaney/master'