Merge "Updates for QS DND tile" into oc-dev