Merge "Fix wrong alpha set on background drawable"