Move 'x' button, shift arrows away from screen edges

Bug: 58653
Change-Id: I290bca497a56240890d64b234e960d04bd4a001c
Merge "Move 'x' button, shift arrows away from screen edges"