Merge "Query outline on background size change"