Merge "LetterboxConfigurationPersisterTest waits on wrong persisterQueue" into udc-qpr-dev