Merge cherrypicks of [8059009, 8059026, 8059343, 8059224, 8059028, 8058794, 8059011] into qt-aml-release

Change-Id: I5523d18ab91c40ba4f6f2416772c0fdaf1379e0b