Merge "hide keyboard onStop and onNewIntent" into sc-dev