Merge "Updating the top scrim to also use dynamicaly generated bitmap" into udc-qpr-dev