Merge "Allow gesture shortcut to be clickable while FAB is present." into main