Merge "Never show shelf when fully dark"