Merge "Handle null desired value in filter" into qt-dev am: 40c23cf2a6
am: 26b2dc9b34

Change-Id: I7bde5d45b574a2b1e1c80a28d4547ec0b73990a5