1)Fix blackberry keyboard issue 2)Other changes