Merge "Set default for controls as enabled." into rvc-dev am: c6616838c3

Change-Id: I7a8a2996985ed8acedbcc9a63740b54522545300