Merge "[Magnifier-43] Refactor to remove code duplication" into pi-dev