Merge "Use shorter string for MasterClear to stop truncating title" into pi-dev