Merge "Update scroll bar color style"