Merge "Correct RTL support of Smart Actions" into sc-qpr1-dev