Merge "Fix incorrect dock defender banner icon." into tm-qpr-dev