Merge "Fix restore from keyboard"