Merge "Optional change for apps to run scan as non-blocking task"