Merge "Use 30dp as the default value for back gesture inset"