Merge remote-tracking branch 'origin/acid-burn/virtualkeyboard'