Merge "allow recovery UI to ignore certain keypresses" into ics-aah