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

Change-Id: Ifcfdff129a94d00b82ce9522d68dc92f0875ddf4