Merge "Fix return when virtual keyboard setting changes." into nyc-mr1-dev