Fix merge conflict in commit with message:

Add filterbar styles missing

Change-Id: I80d1d9adc036c11d8ebcc2e5226c65b4e987030e