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

Change-Id: Id0b2d330d51a4458c738cf7d939f5476958c2a2e