Merge commit 'eb5aeae676fb23b2ad748185867c085e3cd65314' * commit 'eb5aeae676fb23b2ad748185867c085e3cd65314': Adjust boundaries for screen sizes.
Merge commit 'eb5aeae676fb23b2ad748185867c085e3cd65314' * commit 'eb5aeae676fb23b2ad748185867c085e3cd65314': Adjust boundaries for screen sizes.