Merge "Break audio element loop in case element_count becomes too large." into pi-dev am: 4d801e44ba
am: a083f27afb

Change-Id: I08e08b06d45c782f7cea15b06d370a0ef9920db2