Merge "Update asset for "always show" checkmark"