Merge "Fix the shade footer alignment, if there is only one button" into udc-qpr-dev