Merge "Remove divider between QSFooter and media" into sc-dev