[TIMOB-15278] Ensure we get the templates back after view detaches
Merge pull request #4715 from vishalduggal/timob-15278

[TIMOB-15278] Ensure we get the templates back after view detaches