Merge "Decrease amount of getAuthenticatorId invocations to the HAL" into qt-r1-dev