Merge cherrypicks of [7773042, 7773101, 7772813, 7772985, 7772987, 7772989] into qt-c2f2-release

Change-Id: Iaf1c2438d66b8a68b4f2860d6b07ab4f4243f8db