Added a bundle constant for Android + Bugfixes.