Merge "Consider decor offsets on child focus" into lmp-mr1-ub-dev