Merge "Don't display QS security footer in demo mode" into oc-dr1-dev am: ae6776a839
am: 6a5d9108df

Change-Id: Ifdc7c0fda191ad8966213adcd5fa0fa5bd310aa4