Merge "Remove Square icon shape from system image Bug: 136084719 Test: builds" into qt-r1-dev