Merge "Use the correct drawable to badge user icon" into pi-dev