Updating "phone branch" to the current master

This is needed so https://github.com/DroidPlanner/droidplanner/pull/618 can be merged.