[automerger skipped] Merge "DO NOT MERGE: Fix mobile in/out activity indicator icons are not shown correctly"
am: 460b05ebee  -s ours

Change-Id: I69cad822dffff9d2a731ad0ef3f306155d1aedaa