Merge "Change USAP name to application name as soon as possible." into qt-dev-plus-aosp