Merge pull request #3364 from buluw/fix/proxy-account-aware-image-scheduler