This commit completes the solution of this bug for Input settings. Change-Id: Iebabb08bdd4138cff278b811a681d684363ecc12