Merge "Remove key filter from shared preferences listener" into main