Merge "Fixes to support improved external recognizer overlay." into lmp-mr1-dev