Merge "Fixed wrong QS padding" into rvc-dev am: 841f253cb1

Change-Id: I45732bb2fc1596f04d9cc00bfcab2359755597c2