[11.9 port] Make asset image computation simpler
11.9 port of !3110 (merged). Depends on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/27293 going in first.
11.9 port of !3110 (merged). Depends on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/27293 going in first.