Merge "Attempt to reduce problems from issue #3183612" into gingerbread