Fix z-indexes in core

The toolbar only needs to be z-index 1, not 100. The global overlay
needs to be above this and so is set to 2.

Bug: 73650
Change-Id: If8d7796826addf481ff491ca61138faad71b8806
Merge "Fix z-indexes in core"