Merge "Removing clickable function from clock on screen saver" into main