Merge "[flexiglass] Lock indicator shows unlocked when needed." into main