Merge "Override getDrawingRect for wifi and mobile views" into pi-dev