Merge "Don't display QS security footer in demo mode" into oc-dr1-dev