Merge "Constrain 'touch modal' behavior to the activity stack."