Fix toolbar indicators in demo

Change-Id: If55ed64fb30507b38a22c35483267bf3a166cf40