Merge "Adds back inset scale value to main config.xml" into rvc-dev am: 799b92b2d5

Change-Id: I3202334042433a36151c6cdb8de2d702ebf67a25