Merge "Can disable checkbox without tint on text" into pi-dev am: 48831c837f
am: ee3164bd42

Change-Id: I63a71e144fd3b93c2c9b285cd637ba656092fa79