Merge "Fix jank in back indicator."