Merge "Implemented measure to verify edit shortcuts page exists before trying to navigate to it" into main