Merge "Enable styling of dividers for linear and grid view separately." into rvc-dev