Force-merge latest changes from https://github.com/TeamCanjica/android_device_samsung_janice/tree/cm-11.0 into branch chaos