Merge "Removing shelf from 2-button gesture mode"