Merge "Diagnosing expected selector in app-start" into sc-dev