Merge "Do not call pop_back when app has no uses-sdk" into sc-dev