Merge "Account for background drawable size changing when lrtb properties change"