Merge "Add louder keypress sounds for different device configurations" into ics-mr0