Merge "Revert "Allow immediate scan request even if another scan was scheduled later""