Merge "Fixed tests timing out when CUJ is set to stay in app until next CUJ." into qt-dev am: 88ef7e91 am: 1497f76d Change-Id: I64939fd8e6287d11db9b126cd79248e6c5a5ef76