Merge "Make showing loading drawable conditional" into pi-car-dev am: 0a77f726b8 am: 4f0d549007 am: 4a974fad86 am: e1c323a92e

Change-Id: I783878603a761f62d67ac956fbb1466f27051cfb