Merge "Fix ripple on QS Footer" into oc-dev