Merge \"Fix return when virtual keyboard setting changes.\" into nyc-mr1-dev
am: 0bda6fb550
Change-Id: Ib2c6ea1ca9be496408ad6a201dfb24b2c3262f36
This commit is contained in:
am: 0bda6fb550
Change-Id: Ib2c6ea1ca9be496408ad6a201dfb24b2c3262f36