Merge "Handle null desired value in filter" into qt-dev am: 40c23cf2a6 am: 9245917e0e
am: fd30c11b31

Change-Id: Icf69b8a051ba01f906ad7b1f9b6a1b1d67e934c5