Merge "Apply FooterButton builder"