Fix SF layers order in rects view

Implement tie-breaking rules: when two layers have the same
z-order, the layer with larger ID goes on top.

Fix: 292227710
Test: code not testable. Test added in following CL with refactoring.
Change-Id: Ibc83bd81d2e025a42784f9817078951492cff642
2 files changed