Merge "Make contacts app aware of blacklist being disabled (1/3)" into cm-10.1