Merge "Make sure that icons are right aligned in QQS" into sc-dev