[Timeshift.py] Merged, fixing root cause for timeshift files not having been deleted
- Re-established the May 05 fixes that were unintentionally reverted on May 29 (https://github.com/openatv/enigma2/commit/820a5635753a56826fe2470ca8f2b0552b13)
- After this all timeshift files are correctly deleted when switching channels
- So the fix adding timer based removal of timeshift files was longer necessary and has been reverted (https://github.com/openatv/enigma2/commit/a1e1c2260a7fe214a18e6c1e991c1164568dd435)