Refactoring Discarding live preview of interface font

Includes fix for content font as well

Change-Id: Ie97c5d45c6613889975ca6af59c6bd0856d331dc