Merge "Fix navigation bar icon invisible with dimming window" into sc-v2-dev