Merge "Fix issue where keyboard would not be dismissed" into rvc-dev am:...
Merge "Fix issue where keyboard would not be dismissed" into rvc-dev am: 4601299d am: 97b5bdb5 am: 2e84709a am: 006eb225 am: 05f4a538
Change-Id: Ic6af89f72b72887fc62c91170fe0bbb6e226c330