Merge "Debugging for issue #22556778: Starting under voice control not allowed" into mnc-dev