Merge "Fix protectionexpiry using the wrong page"