Fix crashes upon confirming On-The-Spot dialogs

This commit partially reverts "On-The-Spot: Add Gif support" with
change ID Ic1e383c11eb6b8a7a2200470fa31bb28dfc304f7 to fix crashes
related to incorrect UIDs that were taking place when the system
tried to write settings using the UI context.

Change-Id: Ie195e33cde04dd3bdf6116ae251b19269f9cc94f
Merge remote-tracking branch 'pa/kitkat' into kitkat