Merge "Fix User unable to view the keyboard input" into pi-dev