Merge "init: only provide control message results for devices launching > Q"