Settings: Gummy Interface cleanup

Change-Id: I7e14205cd06d9b4c022fe2aad2e68f568cff7d0d
Merge "Settings: Gummy Interface cleanup" into jb4.3