Merge "Fix stupid bug breaking touch on devices without a nav bar." into ics-mr0