Merge "Enable left badge, hidden badge"