Merge "Save and restore accessibility focus using decor view"