Merge "Use config_imeDrawsImeNavBar"