Merge "Fix the empty selection issue when onCreateActionMode returns false"