Fix bug with aborting timestamp update

Changed to go back to 'main' frame if the 'rating-desc' frame doesn't exist (note that this is not a permanent fix, as the override frame will be displayed if it has been selected once, even if it was not selected when the rating was submitted).
Merge branch 'master' into dev