Merge commit '2d7f59319ad81139b826dff79e97cf7263832014' * commit '2d7f59319ad81139b826dff79e97cf7263832014': Fix issue #2302336: System dialogs are not being given a layer