Merge "Clean up FocusedStackFrame layer setting."