Merge "Update toggle switch asset to include content area" into lmp-dev