effects: miscellaneous fixes

fixes of KW issues 8887, 8888

Change-Id: I824daa76d23456fed2c299c59f934d3e2ac78b84
Merge "effects: miscellaneous fixes" into kitkat