Merge "Tint lock icon when entering ambient mode"