OoUiPHP: Improve theme singleton handling

Change-Id: I0869dd794f8fc1e3ede014ceb555cbfbf1d3a184
Merge "OoUiPHP: Improve theme singleton handling"