Merge "Preapre region tracking in layers" into honeycomb