Merge "Actually remove bottom border. Fixes b/17227986." into ub-gmail-ur14-dev