am: 196a057 * commit '196a05724d73832571c6e4ad5372b05840ec041f': Add granular control over disabled effects. Change-Id: I453928754c89113f321df08a4ca8612660b1012c
am: 196a057 * commit '196a05724d73832571c6e4ad5372b05840ec041f': Add granular control over disabled effects. Change-Id: I453928754c89113f321df08a4ca8612660b1012c