Merge "Account filter and profile header style fixes"