Merge "Fix badge asset alpha issue" into lmp-dev