Merge "Fixed bug with stack bounds getting out of alignment with screen rotation" into nyc-dev