Merge "Prepare NotificationCompat for upcoming development post SDK 19." into klp-modular-dev