Ability to hide settings

Change-Id: If814bb096ab84b3685649c3011400795f3c36539