Merge "Light navigation bar support (1/2)"