Issue #3108252 by pratik_kamble, Hardik_Patel_12, rogerpfaff, nishantghetiya: Remove unused variables from layout builder module (cherry picked from commit 6ef456a2)