Merge "Flag off stickiness of show/hide system setting." into tm-dev