Merge "Fix alphabetical ordering of HAL_INTERFACES_OF_INTEREST" into qt-r1-dev