Merge "Keep the shade footer visible during clear-all, if there is a button to display" into udc-qpr-dev