upstream changes minus the lack of nova launcher