Merge "Avoid double escaped expiry time on action=protect"