Fix cancel behaviour of display settings

Font selection becomes persistent despite cancelling it
Bug: 47976

Change-Id: Iea4b65a8a13da3cb4a86f5b6521d62cb1372b42a