Merge remote branch 'origin/acid-burn/virtualkeyboard' into experimental